[IA64][qemu] add changes lost from xen-ia64 cset 10570

This adds back changes from xen-ia64-unstable.hg cset:

10570:8dc4af3f192c7c1ef3cd6921196997b903d25add

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/tools/ioemu/patches/ioemu-ia64 b/tools/ioemu/patches/ioemu-ia64
index c24f8149a3a7558ffe4f71100f384a789dd31005..954d85e5cf2cc9de6a401f99f4ef8de007c5618d 100644 (file)
--- a/tools/ioemu/patches/ioemu-ia64
+++ b/tools/ioemu/patches/ioemu-ia64
@@ -1,7 +1,7 @@
 Index: ioemu/hw/iommu.c
 ===================================================================
---- ioemu.orig/hw/iommu.c      2006-07-26 15:17:35.639762285 +0100
-+++ ioemu/hw/iommu.c   2006-07-26 15:17:39.078387722 +0100
+--- ioemu.orig/hw/iommu.c      2006-07-27 09:04:53.000000000 -0600
++++ ioemu/hw/iommu.c   2006-07-27 09:05:01.000000000 -0600
 @@ -82,7 +82,11 @@
  #define IOPTE_VALID         0x00000002 /* IOPTE is valid */
  #define IOPTE_WAZ           0x00000001 /* Write as zeros */
@@ -16,8 +16,8 @@ Index: ioemu/hw/iommu.c
  
 Index: ioemu/cpu-all.h
 ===================================================================
---- ioemu.orig/cpu-all.h       2006-07-26 15:17:38.728425843 +0100
-+++ ioemu/cpu-all.h    2006-07-26 15:17:39.079387613 +0100
+--- ioemu.orig/cpu-all.h       2006-07-27 09:05:01.000000000 -0600
++++ ioemu/cpu-all.h    2006-07-27 09:05:01.000000000 -0600
 @@ -835,6 +835,31 @@
                  :"=m" (*(volatile long *)addr)
                  :"dIr" (nr));
@@ -52,8 +52,8 @@ Index: ioemu/cpu-all.h
  /* memory API */
 Index: ioemu/vl.c
 ===================================================================
---- ioemu.orig/vl.c    2006-07-26 15:17:39.011395020 +0100
-+++ ioemu/vl.c 2006-07-26 21:11:35.957492161 +0100
+--- ioemu.orig/vl.c    2006-07-27 09:05:01.000000000 -0600
++++ ioemu/vl.c 2006-07-27 09:09:29.000000000 -0600
 @@ -5577,6 +5577,7 @@
          exit(-1);
      }
@@ -82,7 +82,7 @@ Index: ioemu/vl.c
 +    }
 +
 +    if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
-+                             nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){
++                             IO_PAGE_START >> PAGE_SHIFT, 1) != 1) {
 +        fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
 +        exit(-1);
 +    }
@@ -91,7 +91,7 @@ Index: ioemu/vl.c
 +                                       PROT_READ|PROT_WRITE,
 +                                       page_array[0]);
 +
-+    fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n",
++    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
 +            IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
 +#endif
  #else  /* !CONFIG_DM */
@@ -99,8 +99,8 @@ Index: ioemu/vl.c
  #ifdef CONFIG_SOFTMMU
 Index: ioemu/target-i386-dm/exec-dm.c
 ===================================================================
---- ioemu.orig/target-i386-dm/exec-dm.c        2006-07-26 15:17:38.283474311 +0100
-+++ ioemu/target-i386-dm/exec-dm.c     2006-07-26 15:17:39.081387395 +0100
+--- ioemu.orig/target-i386-dm/exec-dm.c        2006-07-27 09:05:01.000000000 -0600
++++ ioemu/target-i386-dm/exec-dm.c     2006-07-27 09:05:01.000000000 -0600
 @@ -340,6 +340,23 @@
      return io_mem_read[io_index >> IO_MEM_SHIFT];
  }
@@ -137,8 +137,8 @@ Index: ioemu/target-i386-dm/exec-dm.c
          len -= l;
 Index: ioemu/exec-all.h
 ===================================================================
---- ioemu.orig/exec-all.h      2006-07-26 15:17:38.200483351 +0100
-+++ ioemu/exec-all.h   2006-07-26 21:11:41.262898983 +0100
+--- ioemu.orig/exec-all.h      2006-07-27 09:05:01.000000000 -0600
++++ ioemu/exec-all.h   2006-07-27 09:05:01.000000000 -0600
 @@ -462,12 +462,13 @@
  }
  #endif
@@ -158,8 +158,8 @@ Index: ioemu/exec-all.h
  
 Index: ioemu/target-i386-dm/cpu.h
 ===================================================================
---- ioemu.orig/target-i386-dm/cpu.h    2006-07-26 15:17:38.282474420 +0100
-+++ ioemu/target-i386-dm/cpu.h 2006-07-26 15:17:39.082387287 +0100
+--- ioemu.orig/target-i386-dm/cpu.h    2006-07-27 09:05:01.000000000 -0600
++++ ioemu/target-i386-dm/cpu.h 2006-07-27 09:05:01.000000000 -0600
 @@ -80,7 +80,11 @@
  /* helper2.c */
  int main_loop(void);
@@ -175,7 +175,7 @@ Index: ioemu/target-i386-dm/cpu.h
 Index: ioemu/ia64_intrinsic.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ ioemu/ia64_intrinsic.h     2006-07-26 15:17:39.083387178 +0100
++++ ioemu/ia64_intrinsic.h     2006-07-27 09:05:01.000000000 -0600
 @@ -0,0 +1,276 @@
 +#ifndef IA64_INTRINSIC_H
 +#define IA64_INTRINSIC_H

diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index 7f3e5447ba41d137903b59fceec32989a4a7c8b7..93e611a32258e5898ee39627d9eb1506ae5262e4 100644 (file)
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -5791,7 +5791,7 @@ int main(int argc, char **argv)
     }
 
     if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
-                             nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){
+                             IO_PAGE_START >> PAGE_SHIFT, 1) != 1) {
         fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
         exit(-1);
     }
@@ -5800,7 +5800,7 @@ int main(int argc, char **argv)
                                        PROT_READ|PROT_WRITE,
                                        page_array[0]);
 
-    fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n",
+    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
             IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
 #endif
 #else  /* !CONFIG_DM */